Include <stdlib.h> if available. Don't declare errno if it's a macro.

diff --git a/lib-src/emacsserver.c b/lib-src/emacsserver.c
index e58cf231933b30756873ebfb486c3bf17b7c8a1c..541e57dcca055f14f08f1bbdd2c4ba5852f88ef7 100644 (file)
--- a/lib-src/emacsserver.c
+++ b/lib-src/emacsserver.c
@@ -65,7 +65,13 @@ void fatal_error ();
 #include <unistd.h>
 #endif
 
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
+
+#ifndef errno
 extern int errno;
+#endif
 
 /* Copied from src/process.c */
 #ifdef FD_SET